Restore/Add support for building some make targets when builddir != srcdir.

Supported targets include the default, check, torture, clean and more-clean.

diff --git a/gpsbabel/Makefile.in b/gpsbabel/Makefile.in
index d95a0d5f0f778cba1267260a8a458a2306ba3301..1c8df289a520a4c3a3f4e53feb85b3b34301785f 100644 (file)
--- a/gpsbabel/Makefile.in
+++ b/gpsbabel/Makefile.in
@@ -140,7 +140,7 @@ fileinfo.o: win32/gpsbabel.rc
 clean:
        rm -f $(OBJS) gpsbabel gpsbabel.exe
        if [ -f gui/Makefile ]; then $(MAKE) -C gui clean; fi
-       ./test-all -W
+       $(srcdir)/test-all -W
 
 configure: configure.in
        autoconf
@@ -150,18 +150,18 @@ tag:
        svn copy https://gpsbabel.googlecode.com/svn/trunk/ https://gpsbabel.googlecode.com/svn/tags/gpsbabel_@GBMAJOR@_@GBMINOR@_@GBMICRO@@PACKAGE_RELEASE@
 
 more-clean: clean
-       tools/mkmoreclean
+       $(srcdir)/tools/mkmoreclean
 
 check:
-       ./testo
+       $(srcdir)/testo
 
 torture:
        @echo "testo in progress... (basic data integrity test)"
-       @./testo
+       @$(srcdir)/testo
        @echo "vtesto in progress... (valgrind is watching testo)"
-       @./vtesto
+       @$(srcdir)/vtesto
        @echo "torture_test in progress... (shortname reduction)"
-       @./torture_test
+       @$(srcdir)/torture_test
 #
 #      Because there are some "non-real" errors like "IGC: bad date" 
 #      test-all does not stop on errors.
@@ -169,7 +169,7 @@ torture:
 #      faults, math overflows and other hard errors
 #
        @echo "test-all in progress... (read/write test between all possible formats)"
-       @./test-all -s -r reference/expertgps.gpx -t
+       @$(srcdir)/test-all -s -r $(srcdir)/reference/expertgps.gpx -t
 
 #
 # This will only work on UNIX-like substances.
@@ -192,8 +192,8 @@ leaktest:
 
 dep:
        make clean && make EXTRA_CFLAGS="-isystem /sw/include -MMD"  && cat $(sort $(DEPFILES)) > /tmp/dep && rm $(DEPFILES)
-       echo "internal_styles.c: mkstyle.sh style/*.style" >> /tmp/dep
-       echo "  @srcdir@/mkstyle.sh > internal_styles.c || (rm -f internal_styles.c ; exit 1)"  >> /tmp/dep
+       echo 'internal_styles.c: mkstyle.sh $$(srcdir)/style/*.style' >> /tmp/dep
+       echo '  $$(srcdir)/mkstyle.sh > internal_styles.c || (rm -f internal_styles.c ; exit 1)'  >> /tmp/dep
        echo Edit Makefile.in and bring in /tmp/dep
 
 $(WEB)/htmldoc-$(DOCVERSION)/index.html: FORCE
@@ -1148,5 +1148,5 @@ zlib/trees.o: zlib/trees.c zlib/deflate.h zlib/zutil.h zlib/zlib.h \
   zlib/zconf.h zlib/trees.h
 zlib/uncompr.o: zlib/uncompr.c zlib/zlib.h zlib/zconf.h
 zlib/zutil.o: zlib/zutil.c zlib/zutil.h zlib/zlib.h zlib/zconf.h
-internal_styles.c: mkstyle.sh style/*.style
-       ./mkstyle.sh > internal_styles.c || (rm -f internal_styles.c ; exit 1)
+internal_styles.c: mkstyle.sh $(srcdir)/style/*.style
+       $(srcdir)/mkstyle.sh > internal_styles.c || (rm -f internal_styles.c ; exit 1)

diff --git a/gpsbabel/test-all b/gpsbabel/test-all
index c33bffc4bb367c1df9839842c36eb443ac193823..298c5de3f4aed9c180d6d236302e1c65073327d5 100755 (executable)
--- a/gpsbabel/test-all
+++ b/gpsbabel/test-all
@@ -3,7 +3,8 @@
 ### cross format read/(write) test ###
 
 PNAME=${PNAME:-./gpsbabel}
-REFGPX="reference/expertgps.gpx"       # reference file for all tests
+BASEPATH=`dirname $0`
+REFGPX="${BASEPATH}/reference/expertgps.gpx"   # reference file for all tests
 EXCL="exif ozi vitosmt xol navigonwpt gopal"   # exclude formats from test
 CAPS=""
 TEMPDIR=${GBTEMP:-/tmp}/gb-test-all

diff --git a/gpsbabel/testo b/gpsbabel/testo
index 5554c247f2d4cf06c93eccc1ec1a47ab46795094..6db998124f5077faacee4dc0e9911345abee7e99 100755 (executable)
--- a/gpsbabel/testo
+++ b/gpsbabel/testo
@@ -81,7 +81,7 @@ if [ $# -ge 1 ];
 then
   while [ $# -ge 1 ];
   do
-    t=testo.d/$1.test
+    t=${BASEPATH}/testo.d/$1.test
     echo Running $t
     . $t
     shift;
@@ -89,7 +89,7 @@ then
   exit $errorcount
 fi
 
-for i in testo.d/*.test
+for i in ${BASEPATH}/testo.d/*.test
 do
   echo Running $i
   . $i

diff --git a/gpsbabel/testo.d/classic-1.test b/gpsbabel/testo.d/classic-1.test
old mode 100755 (executable)
new mode 100644 (file)
index eaf5ec6..52c455b
--- a/gpsbabel/testo.d/classic-1.test
+++ b/gpsbabel/testo.d/classic-1.test
@@ -100,12 +100,12 @@ compare ${REFERENCE}/lowrance-v3-unicsv.txt ${TMPDIR}/lowrance-v3-unicsv.txt
 #
 # CSV (Comma separated value) data.
 
-gpsbabel  -i geo -f ${REFERENCE}/../geocaching.loc -o csv -F ${TMPDIR}/csv.csv
-gpsbabel  -i csv -f ${TMPDIR}/csv.csv -o csv -F ${TMPDIR}/csv2.csv
+gpsbabel -i geo -f ${REFERENCE}/../geocaching.loc -o csv -F ${TMPDIR}/csv.csv
+gpsbabel -i csv -f ${TMPDIR}/csv.csv -o csv -F ${TMPDIR}/csv2.csv
 compare ${TMPDIR}/csv2.csv ${TMPDIR}/csv.csv 
 # And the alternate command line version.
-gpsbabel  -i csv -o gpx ${TMPDIR}/csv.csv ${TMPDIR}/csv3.gpx
-gpsbabel  -i gpx -o csv ${TMPDIR}/csv3.gpx ${TMPDIR}/csv4.csv
+gpsbabel -i csv -o gpx ${TMPDIR}/csv.csv ${TMPDIR}/csv3.gpx
+gpsbabel -i gpx -o csv ${TMPDIR}/csv3.gpx ${TMPDIR}/csv4.csv
 compare ${TMPDIR}/csv.csv ${TMPDIR}/csv4.csv 
 
 #

diff --git a/gpsbabel/testo.d/classic-2.test b/gpsbabel/testo.d/classic-2.test
old mode 100755 (executable)
new mode 100644 (file)
index ee2670b..cfc287e
--- a/gpsbabel/testo.d/classic-2.test
+++ b/gpsbabel/testo.d/classic-2.test
@@ -401,13 +401,13 @@ compare ${REFERENCE}/cototestmarker.gpx ${TMPDIR}/cotomarker.gpx
 #
 # Fugawi test cases
 rm -f ${TMPDIR}/fugawi*
-gpsbabel  -i fugawi -f ${REFERENCE}/fugawi.notime.txt -o fugawi -F ${TMPDIR}/fugawi1.txt
+gpsbabel -i fugawi -f ${REFERENCE}/fugawi.notime.txt -o fugawi -F ${TMPDIR}/fugawi1.txt
 compare ${REFERENCE}/fugawi.ref.txt ${TMPDIR}/fugawi1.txt
-gpsbabel  -i geo -f ${REFERENCE}/../geocaching.loc -o fugawi -F ${TMPDIR}/fugawi2.txt
+gpsbabel -i geo -f ${REFERENCE}/../geocaching.loc -o fugawi -F ${TMPDIR}/fugawi2.txt
 compare ${REFERENCE}/fugawi.ref.txt ${TMPDIR}/fugawi2.txt
-gpsbabel  -i fugawi -f ${TMPDIR}/fugawi2.txt -o fugawi -F ${TMPDIR}/fugawi3.txt
+gpsbabel -i fugawi -f ${TMPDIR}/fugawi2.txt -o fugawi -F ${TMPDIR}/fugawi3.txt
 compare ${TMPDIR}/fugawi2.txt ${TMPDIR}/fugawi3.txt
-gpsbabel  -i fugawi -f ${REFERENCE}/fugawi.time.txt  -o fugawi -F ${TMPDIR}/fugawi4.txt
+gpsbabel -i fugawi -f ${REFERENCE}/fugawi.time.txt  -o fugawi -F ${TMPDIR}/fugawi4.txt
 compare ${REFERENCE}/fugawi.time.ref.txt ${TMPDIR}/fugawi4.txt
 gpsbabel -i gpx -f ${REFERENCE}/track/tracks.gpx  -o fugawi -F ${TMPDIR}/fugawi5.txt
 compare ${REFERENCE}/track/fugawi.txt ${TMPDIR}/fugawi5.txt

diff --git a/gpsbabel/testo.d/classic-3.test b/gpsbabel/testo.d/classic-3.test
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/gpsbabel/testo.d/classic-4.test b/gpsbabel/testo.d/classic-4.test
old mode 100755 (executable)
new mode 100644 (file)
index e2fb431..41cf7d3
--- a/gpsbabel/testo.d/classic-4.test
+++ b/gpsbabel/testo.d/classic-4.test
@@ -115,8 +115,8 @@ gpsbabel -i gpx -f ${TMPDIR}/${GoPalName}.im2  -o gopal -F ${TMPDIR}/${GoPalName
 compare ${TMPDIR}/${GoPalName}.tst2 ${TMPDIR}/${GoPalName}.tst3
 
 # Gopal with 11 fields is slightly more sane.
-gpsbabel -i gopal -f reference/gopal-11.trk -o gpx -F ${TMPDIR}/gopal-11-gpx.gpx
-compare ${TMPDIR}/gopal-11-gpx.gpx reference/gopal-11-gpx.gpx
+gpsbabel -i gopal -f ${REFERENCE}/gopal-11.trk -o gpx -F ${TMPDIR}/gopal-11-gpx.gpx
+compare ${TMPDIR}/gopal-11-gpx.gpx ${REFERENCE}/gopal-11-gpx.gpx
 
 #
 # Height filter

diff --git a/gpsbabel/testo.d/igo8.test b/gpsbabel/testo.d/igo8.test
index 85186666cc69585f07c23479f9d2836fae1bb0f8..7e494eb1554ebb7a8ee8937b80e2b868d7f359cf 100644 (file)
--- a/gpsbabel/testo.d/igo8.test
+++ b/gpsbabel/testo.d/igo8.test
@@ -12,4 +12,4 @@ compare ${TMPDIR}/igo.gpx ${TMPDIR}/new-igo2.gpx
 # verify that one such files converts sensibly to GPX.
 
 gpsbabel -i igo8 -f ${REFERENCE}/track/igo8_padded.trk -o gpx -F ${TMPDIR}/igo8_padded.gpx
-compare reference/track/igo8_padded~gpx.gpx ${TMPDIR}/igo8_padded.gpx
+compare ${REFERENCE}/track/igo8_padded~gpx.gpx ${TMPDIR}/igo8_padded.gpx

diff --git a/gpsbabel/testo.d/kml.test b/gpsbabel/testo.d/kml.test
index 6241307d3fc7780cf11e4a3b056d4377c1c56ca9..d3fdb8012288b7e4f08246fc8ecd0f8e14b97c0b 100644 (file)
--- a/gpsbabel/testo.d/kml.test
+++ b/gpsbabel/testo.d/kml.test
@@ -46,11 +46,11 @@ then
     case $f in 
       # Argue with the KML wizards about this.  It was the intent for that
       # to be legal in Earth GX 2.2.
-      ./reference/track/segmented_tracks-track.kml) continue;;
+      ${REFERENCE}/track/segmented_tracks-track.kml) continue;;
     *)
       tmpf=${TMPDIR}/$(basename $f)
       gpsbabel -i kml -f $f -o kml -F $tmpf
-      xmllint --schema tools/kml22-schema/kml22gx.xsd --noout $tmpf
+      xmllint --schema ${BASEPATH}/tools/kml22-schema/kml22gx.xsd --noout $tmpf
     esac;
   done
 else

diff --git a/gpsbabel/testo.d/mainnav.test b/gpsbabel/testo.d/mainnav.test
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/gpsbabel/testo.d/mtk_locus.test b/gpsbabel/testo.d/mtk_locus.test
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/gpsbabel/vtesto b/gpsbabel/vtesto
index 396b099b0cc44e8f52f9a7ecccc292a029f1bc3d..341a3f720fa12b22fd2f9acf02571a40804ffa54 100755 (executable)
--- a/gpsbabel/vtesto
+++ b/gpsbabel/vtesto
@@ -6,4 +6,5 @@
 # from time to time.
 #
 
-PNAME="valgrind -q ./gpsbabel" ./testo
+BASEPATH=`dirname $0`
+PNAME="valgrind -q ./gpsbabel" ${BASEPATH}/testo